merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 9 Aug 2006 16:32:23 +0000 (10:32 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 9 Aug 2006 16:32:23 +0000 (10:32 -0600)
commit879f62cd48127a3b2543b1fc927ce507c9f00d6b
tree7dfc78a3566a79ab90bbafae6aa2f78e3ace94f5
parent773aa14ec3b2eabd69d0b135027ddeed918c2e15
parentac0be2c025003ba9e51b2e98f1b6ed7eab633cba
merge with xen-unstable.hg